projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd1dac3 cb4c3de)
bitkeeper revision 1.1159.195.1 (41a5e79b-bYOOEp0ftyINgKfwySPQw)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 25 Nov 2004 14:09:31 +0000 (14:09 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 25 Nov 2004 14:09:31 +0000 (14:09 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp

1  2 
linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S patch | diff1 | diff2 | blob | history
xen/arch/x86/setup.c patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/setup.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.